Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from microsoft:main #70

Open
wants to merge 10,000 commits into
base: main
Choose a base branch
from
Open

[pull] main from microsoft:main #70

wants to merge 10,000 commits into from

Conversation

pull[bot]
Copy link

@pull pull bot commented Aug 11, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Aug 11, 2021
justschen and others added 29 commits February 7, 2025 00:32
fix error message when image sent to model
…ed-context

Context for ai results requested
This is from how the old vscode.proposed.d.ts was managed, and is no longer relevant
…hen computing imports to add

Fixes #235959

When pasting across files, sometimes users can see a spinner while we wait to see if TS has a `paste with imports` edit. This needs to be done even if we insert plain text by default so that we can then show the paste widget and user can select `paste with imports`

This change makes it so that if TS takes over 200ms, we assume that a paste operation may be available and return an unresolved edit for it. Only when the edit then actually needs to be applied, we wait for TS to respond

In most cases we won't need to wait because plain text will be pasted by default. Users will then only see the spinner after selecting `paste with imports`
….json should use URI for virtual filesystems (#235954)" (#239905)

This reverts commit d3145c5.

Fixes #239903
* files - abandon watcher correlation API proposal

* fix compile
Optimistically show `paste with imports` if TS server takes to long when computing imports to add
connor4312 and others added 30 commits February 12, 2025 18:18
set WH delay to 0 by default
* adds observable debug logger

* fixes CI
* added notebook widget to view changes inline

* fix trusted html generator

* inline diff within cells

* watch for cells becoming visible

* change old version model to observable property on notebook widget

* include contribution either way

* re-initialize if the model was attached

* background color of output

* put inline toggle behind config

* put observable on notebookOptions rather than directly on editor

* isolate notebook widget to its own file

* moved inline diff files into diff

* get notebook widget from editor for notebook actions

---------

Co-authored-by: amunger <>
* Rework the settings and implementation

* Add settings descriptions

* Update default enablement
* try to start on the setting for shell env..

* remove unwanted

* TODO, lost save progress

* Im not sure

* why setting value not passed in properly

* setting value rarely !undefined

* mystery

* mystery unlocked, TODO: clean up

* clean up

* provide opt-out setting for pwsh

* wording for ShellIntegrationEnvironmentReporting... hmm

* dont leave debris, get ready for review

* debris

* let me fix these tests

* I need to get the tests to work

* take feedback for wording, commit here since outdated

* fix fix fix test

* got TS side working, TODO: adjust bash side

* remove unncessary stable check in bash side

* Update src/vs/workbench/contrib/terminal/common/scripts/shellIntegration.ps1

Co-authored-by: Daniel Imms <[email protected]>

* remove extra shell_env_var in bash side

* remove unnecessary comment as recommended

* remove $stable check for ps1

* decision cannot be undone when config changes, after terminal is created

* change the namings!

* fix tests

* fix test

* TESTS

* dqw

---------

Co-authored-by: Daniel Imms <[email protected]>
Revert "adds observable debug logger (#240559)"

This reverts commit c52539a.
* some attachment warnings

* move await to before so we don't check so many times

* some cleanup

* fix merge conflicts
* Use tree sitter for ini
Part of #210475

* Include ini in tree sitter colorization tests

* Remove /r
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.